bitkeeper revision 1.1389.15.20 (428294c4qHPwfJns6WjtuWHA518RQg)

Build tweak for earlier domU ACPI fixes.  Silly me.

Signed-off-by: mark.williamson@cl.cam.ac.uk

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
index 9b4ce0892a94c24ef3e85377bbeb7789eaf844d0..a53fdd31d42da70093c0a96c345f4c7e231bcc4d 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -1571,12 +1571,14 @@ void __init setup_arch(char **cmdline_p)
        op.u.set_iopl.iopl = current->thread.io_pl = 1;
        HYPERVISOR_physdev_op(&op);
 
+#ifdef CONFIG_ACPI_BOOT
        if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
        {
             printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
             acpi_disabled = 1;
              acpi_ht = 0;
        }
+#endif
 
        /*
         * Parse the ACPI tables for possible boot-time SMP configuration.